Skip to content

Conversation

@jdpleiness
Copy link
Contributor

This should fix the CI issue that is currently causing the build pipeline to fail. Furthermore, this cuts down the files baked into the iamge to only those needed.

This should fix the CI issue that is currently causing the build
pipeline to fail. Furthermore, this cuts down the files baked into the
iamge to only those needed.
@jdpleiness jdpleiness requested a review from a team January 6, 2025 19:29
@jdpleiness jdpleiness enabled auto-merge (squash) January 6, 2025 19:47
@jdpleiness jdpleiness merged commit 4957bcb into main Jan 6, 2025
1 check passed
@jdpleiness jdpleiness deleted the jdp/rel/fix-file-upload branch January 6, 2025 23:47
@sourcegraph-release-bot
Copy link

The backport to 5.11.x failed at https://github.com/sourcegraph/deploy/actions/runs/12642310923:

The process '/usr/bin/git' failed with exit code 128

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 5.11.x -p 135
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.11.x 5.11.x
# Navigate to the new working tree
cd .worktrees/backport-5.11.x
# Create a new branch
git switch --create backport-135-to-5.11.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4957bcb466d73afc6105e7b3340d00fdb3f5ef54
# Push it to GitHub
git push --set-upstream origin backport-135-to-5.11.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.11.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-135-to-5.11.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.11.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 5.11.x and the compare/head branch is backport-135-to-5.11.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants